From 4d3c09d0555dc00aefba6519ff977508320f519a Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 2 Aug 2009 15:23:53 -0700 Subject: [PATCH] Fix spelling, menu section, copyright, and add lintian-overrides. --- debian/.gitignore | 5 +++++ debian/changelog | 8 +++++++- debian/control | 4 ++-- debian/control.in | 4 ++-- debian/copyright | 4 ++-- debian/copyright.in | 4 ++-- debian/emacsVER-bin-common.lintian-overrides | 1 + debian/emacsVER-common.lintian-overrides | 1 + debian/emacsVER.lintian-overrides | 2 ++ debian/emacsVER.menu | 4 ++-- debian/rules | 12 ++++++++++++ 11 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 debian/emacsVER-bin-common.lintian-overrides create mode 100644 debian/emacsVER-common.lintian-overrides create mode 100644 debian/emacsVER.lintian-overrides diff --git a/debian/.gitignore b/debian/.gitignore index 80e8caefd68..7027f2959cb 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -10,6 +10,7 @@ /emacs23-bin-common /emacs23-bin-common.README.Debian /emacs23-bin-common.debhelper.log +/emacs23-bin-common.lintian-overrides /emacs23-bin-common.postinst /emacs23-bin-common.postrm /emacs23-bin-common.prerm @@ -19,6 +20,7 @@ /emacs23-common.debhelper.log /emacs23-common.docs /emacs23-common.links +/emacs23-common.lintian-overrides /emacs23-common.postinst /emacs23-common.prerm /emacs23-common.substvars @@ -30,6 +32,7 @@ /emacs23-gtk.README.Debian /emacs23-gtk.debhelper.log /emacs23-gtk.desktop +/emacs23-gtk.lintian-overrides /emacs23-gtk.menu /emacs23-gtk.postinst /emacs23-gtk.postinst.debhelper @@ -41,6 +44,7 @@ /emacs23-nox.debhelper.log /emacs23-nox.desktop /emacs23-nox.links +/emacs23-nox.lintian-overrides /emacs23-nox.menu /emacs23-nox.postinst /emacs23-nox.postinst.debhelper @@ -52,6 +56,7 @@ /emacs23.debhelper.log /emacs23.desktop /emacs23.links +/emacs23.lintian-overrides /emacs23.menu /emacs23.postinst /emacs23.postinst.debhelper diff --git a/debian/changelog b/debian/changelog index 7a22040e1a4..8a8a2d8b22c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,13 @@ emacs23 (23.1+1-2) unstable; urgency=low * Add libpm-dev and libdbus-1-dev build dependencies. Thanks to Sven Joachim . - -- Rob Browning Sun, 02 Aug 2009 12:11:56 -0700 + * Fix a spelling error, fix a menu section error, add a version to + the GPL file referred to by debian/copyright, and add a number of + debian/emacsVER*.lintian-overrides to quiet long-standing + warnings. Thanks to Sven Joachim for the + reminder. + + -- Rob Browning Sun, 02 Aug 2009 14:53:26 -0700 emacs23 (23.1+1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a827416262a..adf1e1c431c 100644 --- a/debian/control +++ b/debian/control @@ -51,9 +51,9 @@ Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader Suggests: emacs23-common-non-dfsg Conflicts: emacs23, emacs23-nox, w3-el Replaces: emacs23, emacs23-nox -Description: The GNU Emacs editor (with GTK user interface) +Description: The GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. - This package contains a version of Emacs with a GTK user interface. + This package contains a version of Emacs with a GTK+ user interface. Package: emacs23-bin-common Section: editors diff --git a/debian/control.in b/debian/control.in index c2e4b2f66fa..212bb3d2a2c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -51,9 +51,9 @@ Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, w3-el Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox -Description: The GNU Emacs editor (with GTK user interface) +Description: The GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. - This package contains a version of Emacs with a GTK user interface. + This package contains a version of Emacs with a GTK+ user interface. Package: @DEB_FLAVOR@-bin-common Section: editors diff --git a/debian/copyright b/debian/copyright index a916c026188..a118190a4d2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,8 +33,8 @@ verbatim copying, or because there was some other question. Copyright: Emacs itself is licensed under the terms of the GNU General Public - License (GPL). See the file /usr/share/common-licenses/GPL for more - information. + License (GPL), Version 3. See the file + /usr/share/common-licenses/GPL-3 for more information. doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and doc/man/rcs-checkin.1 are licensed as follows: diff --git a/debian/copyright.in b/debian/copyright.in index 6a56e34aac6..403ae9f31db 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -33,8 +33,8 @@ verbatim copying, or because there was some other question. Copyright: Emacs itself is licensed under the terms of the GNU General Public - License (GPL). See the file /usr/share/common-licenses/GPL for more - information. + License (GPL), Version 3. See the file + /usr/share/common-licenses/GPL-3 for more information. doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and doc/man/rcs-checkin.1 are licensed as follows: diff --git a/debian/emacsVER-bin-common.lintian-overrides b/debian/emacsVER-bin-common.lintian-overrides new file mode 100644 index 00000000000..5a8208e1e46 --- /dev/null +++ b/debian/emacsVER-bin-common.lintian-overrides @@ -0,0 +1 @@ +@PKG_NAME@ binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail diff --git a/debian/emacsVER-common.lintian-overrides b/debian/emacsVER-common.lintian-overrides new file mode 100644 index 00000000000..349d1ff559f --- /dev/null +++ b/debian/emacsVER-common.lintian-overrides @@ -0,0 +1 @@ +@PKG_NAME@ binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs diff --git a/debian/emacsVER.lintian-overrides b/debian/emacsVER.lintian-overrides new file mode 100644 index 00000000000..0fe8ab772f6 --- /dev/null +++ b/debian/emacsVER.lintian-overrides @@ -0,0 +1,2 @@ +@PKG_NAME@ binary: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm +@PKG_NAME@ binary: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm diff --git a/debian/emacsVER.menu b/debian/emacsVER.menu index 86248e8a7a9..0ef657cae2f 100644 --- a/debian/emacsVER.menu +++ b/debian/emacsVER.menu @@ -1,6 +1,6 @@ ?package(@PKG_NAME@):\ needs="X11"\ - section="Apps/Editors"\ + section="Applications/Editors"\ title="Emacs @MENU_VERSION@ (X11)"\ command="/usr/bin/@DEB_FLAVOR@"\ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\ @@ -9,7 +9,7 @@ ?package(@PKG_NAME@):\ needs="text"\ - section="Apps/Editors"\ + section="Applications/Editors"\ title="Emacs @MENU_VERSION@ (text)"\ command="/usr/bin/@DEB_FLAVOR@ -nw"\ icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\ diff --git a/debian/rules b/debian/rules index fcaf461eac7..a8373767a21 100755 --- a/debian/rules +++ b/debian/rules @@ -207,25 +207,31 @@ nonpersistent_autogen_build_files := # These files must always exist, i.e. can't ever be cleaned. persistent_autogen_install_files := + nonpersistent_autogen_install_files := \ + debian/$(flavor)-bin-common.lintian-overrides \ debian/$(flavor)-bin-common.postinst \ debian/$(flavor)-bin-common.prerm \ debian/$(flavor)-common.README.Debian \ debian/$(flavor)-common.docs \ + debian/$(flavor)-common.lintian-overrides \ debian/$(flavor)-common.postinst \ debian/$(flavor)-common.prerm \ debian/$(flavor)-nox.README.Debian \ + debian/$(flavor)-nox.lintian-overrides \ debian/$(flavor)-nox.menu \ debian/$(flavor)-nox.postinst \ debian/$(flavor)-nox.prerm \ debian/$(flavor)-gtk.README.Debian \ debian/$(flavor)-gtk.desktop \ + debian/$(flavor)-gtk.lintian-overrides \ debian/$(flavor)-gtk.menu \ debian/$(flavor)-gtk.postinst \ debian/$(flavor)-gtk.prerm \ debian/$(flavor).README.Debian \ debian/$(flavor).desktop \ debian/$(flavor).menu \ + debian/$(flavor).lintian-overrides \ debian/$(flavor).postinst \ debian/$(flavor).prerm @@ -413,6 +419,7 @@ check-vars: @echo "runtime_ver: $(runtime_ver)" @echo "major_ver: $(major_ver)" @echo "minor_ver: $(minor_ver)" + @echo "movemail_bin: $(movemail_bin)" .PHONY: check-vars .PHONY: check-diff @@ -513,6 +520,9 @@ debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox debian/$(flavor)-gtk.%: xsupport := "gtk" debian/$(flavor)-gtk.%: pkg_name := $(flavor)-gtk +debian/$(flavor)-common.%: pkg_name := $(flavor)-common +debian/$(flavor)-bin-common.%: pkg_name := $(flavor)-bin-common + debian/%: debian/%.in debian/changelog $(call deb_sub,$<,$@) @@ -845,6 +855,7 @@ binary-indep: build install dh_testdir -i dh_testroot -i dh_installchangelogs -i + dh_lintian -i dh_installdocs -i dh_link -i dh_strip -i @@ -861,6 +872,7 @@ binary-arch: build install dh_testdir -a dh_testroot -a dh_installinfo -a + dh_lintian -a dh_installman -a dh_installchangelogs -a dh_installdocs -a -- 2.30.2